file chooser: Stop using gtk_window_get_position

It is going away.

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 5c9daeb66afbf61cdc7feb7073353d430ce11a44..ce29143f8b88777cc58107d377b696a143f7bb69 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -581,39 +581,9 @@ gtk_file_chooser_dialog_map (GtkWidget *widget)
   GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->map (widget);
 }
 
-static void
-save_dialog_geometry (GtkFileChooserDialog *dialog)
-{
-  GtkWindow *window;
-  GSettings *settings;
-  int old_x, old_y, old_width, old_height;
-  int x, y, width, height;
-
-  settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (dialog));
-
-  window = GTK_WINDOW (dialog);
-
-  gtk_window_get_position (window, &x, &y);
-  gtk_window_get_size (window, &width, &height);
-
-  g_settings_get (settings, SETTINGS_KEY_WINDOW_POSITION, "(ii)", &old_x, &old_y);
-  if (old_x != x || old_y != y)
-    g_settings_set (settings, SETTINGS_KEY_WINDOW_POSITION, "(ii)", x, y);
-
-  g_settings_get (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", &old_width, &old_height);
-  if (old_width != width || old_height != height)
-    g_settings_set (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", width, height);
-
-  g_settings_apply (settings);
-}
-
 static void
 gtk_file_chooser_dialog_unmap (GtkWidget *widget)
 {
-  GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget);
-
-  save_dialog_geometry (dialog);
-
   GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->unmap (widget);
 }
 
@@ -627,8 +597,6 @@ gtk_file_chooser_dialog_size_allocate (GtkWidget *widget,
                                                                           width,
                                                                           height,
                                                                           baseline);
-  if (gtk_widget_is_drawable (widget))
-    save_dialog_geometry (GTK_FILE_CHOOSER_DIALOG (widget));
 }
 
 /* We do a signal connection here rather than overriding the method in

diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h
index 0094beb299ad29265e3407535a879e92bf7a8ba1..c16fac31741822c5536a159c984376d5f8ee86f6 100644 (file)
--- a/gtk/gtkfilechooserprivate.h
+++ b/gtk/gtkfilechooserprivate.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 #define SETTINGS_KEY_SHOW_SIZE_COLUMN       "show-size-column"
 #define SETTINGS_KEY_SORT_COLUMN            "sort-column"
 #define SETTINGS_KEY_SORT_ORDER             "sort-order"
-#define SETTINGS_KEY_WINDOW_POSITION        "window-position"
 #define SETTINGS_KEY_WINDOW_SIZE            "window-size"
 #define SETTINGS_KEY_SIDEBAR_WIDTH          "sidebar-width"
 #define SETTINGS_KEY_STARTUP_MODE           "startup-mode"

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 3227a84e1f6751b3d7655a33f04284db8b2d35c7..1ced470793d28ff3ab6fd82e468bb2fd81fe0a0f 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -6068,15 +6068,14 @@ gtk_file_chooser_widget_get_default_size (GtkFileChooserEmbed *chooser_embed,
   GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (chooser_embed);
   GtkFileChooserWidgetPrivate *priv = impl->priv;
   GtkRequisition req;
-  int x, y, width, height;
+  int width, height;
   GSettings *settings;
 
   settings = _gtk_file_chooser_get_settings_for_widget (GTK_WIDGET (impl));
 
-  g_settings_get (settings, SETTINGS_KEY_WINDOW_POSITION, "(ii)", &x, &y);
   g_settings_get (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", &width, &height);
 
-  if (x >= 0 && y >= 0 && width > 0 && height > 0)
+  if (width > 0 && height > 0)
     {
       *default_width = width;
       *default_height = height;